diff --git a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/MD5SUMS.txt b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/MD5SUMS.txt
index 61b9063..b28964e 100644
--- a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/MD5SUMS.txt
+++ b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/MD5SUMS.txt
@@ -1,4 +1,4 @@
-9e5bd5524c1379c511dd92ea33393ad7  abl.elf
+bebec2693af4135bd0e55a9733330d4c  abl.elf
 71c6dd41e387ddb12c8553091928ec39  aop.mbn
 b6d81b360a5672d80c27430f39153e2c  boot-erase.img
 40e97319f57ab9d0b60009163ff940c2  BTFM.bin
@@ -7,29 +7,29 @@
 699e4dc2a0dbac11b255c79422744b44  devcfg.mbn
 d5cf22da99f6a871d4c7d43ce8eb801a  dspso.bin
 4400827c0a6689bfe118a67d79b4fcd7  flashall
-61362db524d6b1a082aa3e68c5ce5226  gpt_backup0.bin
-10711bd7b6c795b396ec7acc6546641b  gpt_backup1.bin
-1384ab8fa504bed08282b9fdbedd1256  gpt_backup2.bin
-f9f43f922865a282bd340731e2e4c05c  gpt_backup3.bin
-c98f59260b9d839fd66c7a799344763b  gpt_backup4.bin
-f1dd799d40155b2fb0a13e74dc708ef0  gpt_backup5.bin
-62809acaa9deeafbcf228ab3dec80fba  gpt_both0.bin
-1a45d3cc41bf1f7ab52c35a8dafde7c2  gpt_both1.bin
-26156f1cf28c2b03a52dc645e0776a6a  gpt_both2.bin
-836794cd35e92ac1865bca5bceb3afa8  gpt_both3.bin
-2a728d731064cb62a253e05fda09584c  gpt_both4.bin
-9b30da0d32e99c239a51c3d868960fde  gpt_both5.bin
-d3d913561434b15f1fd42b5c26b6e514  gpt_main0.bin
-42d103f66ffadf2fabe079c864d6ad2f  gpt_main1.bin
-33f9210eb72379fa4d737f7d968d69fe  gpt_main2.bin
-41530c11400b67d4efaca893a7bbc99f  gpt_main3.bin
-2ac0679ed66a373fc2a863dcb17bf6bf  gpt_main4.bin
-866e4769d16b95bb473441fa79b39d23  gpt_main5.bin
+d04ddc2ba6ddc3f46277be0f5110b89c  gpt_backup0.bin
+419282dd351676dd57bbdbf9071d3e0d  gpt_backup1.bin
+e4ec698b620dc22e21f8535d0e86974d  gpt_backup2.bin
+ac76f9ed9c900519ac2674ec57bb3567  gpt_backup3.bin
+3344e3a3f0cc9bd6724a6daf54795999  gpt_backup4.bin
+5abe36752afdf6906a34446fb07ba577  gpt_backup5.bin
+95ee7f7e67da134eb78feaba2632ea88  gpt_both0.bin
+2262a9ca99e9a4d0f14e82d72ef3875e  gpt_both1.bin
+3f5b9188752af8559b62dca9734a412b  gpt_both2.bin
+beae90cc33e3e49030ea4ae55506d7d5  gpt_both3.bin
+1e96d0067787380a271877f03a0d697f  gpt_both4.bin
+d3e137333ddfad50e598b96d0bfd9099  gpt_both5.bin
+1d36ec2fd30f8a36b572912c68b84cd5  gpt_main0.bin
+c7430987eba9d90f439b8ee4553cc82d  gpt_main1.bin
+4545b1e540e2b974a267b431c201a6b5  gpt_main2.bin
+d2e476646595d7b7a1e10ca80cb00db4  gpt_main3.bin
+f3fab8efdf25c1321e76c46e3706996d  gpt_main4.bin
+a5e59821587d028dfca32d751b94cb25  gpt_main5.bin
 94794668fb0a63c599e754cba52f6517  hyp.mbn
 35cc47772102f785807556e03135764a  imagefv.elf
 1fbaef77827cc531b5b7372ad1ee4937  keymaster64.mbn
 cbbe399f2c983ad51768f4561587f000  LICENSE
-c1c770a035a596c4b13a08789a76a137  patch0.xml
+7da8e656c3c01e6471479328af510728  patch0.xml
 0780990ee59934bdcaffc918cac99aed  patch1.xml
 81036277fd056a16c0e418a756a5a835  patch2.xml
 f1e955eeee449ed57767ac0b87552cf1  patch3.xml
@@ -37,7 +37,7 @@
 ab5847dcda2a52572616499f37ff1676  patch5.xml
 61e29ca7d21884af0e3a813d3bd0ade1  prog_firehose_ddr.elf
 57f570d8896ef6c0e55af6c3dc0940e1  qupv3fw.elf
-aea48fb241747a7db9741b05d2cc8a5e  rawprogram0.xml
+a4335c18367bd7edd478f59482259476  rawprogram0.xml
 078978d92fc3c2a0ad0744e5e905e806  rawprogram1.xml
 e829b09f11eeed7f44caca1b592c91bf  rawprogram2.xml
 e03411d04b290ffe1ea9b993d1f23074  rawprogram3.xml
diff --git a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/abl.elf b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/abl.elf
index a8e5195..74101e0 100644
--- a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/abl.elf
+++ b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/abl.elf
Binary files differ
diff --git a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_backup0.bin b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_backup0.bin
index c293d6c..724c269 100644
--- a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_backup0.bin
+++ b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_backup0.bin
Binary files differ
diff --git a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_backup1.bin b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_backup1.bin
index a7df42f..03ea3ce 100644
--- a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_backup1.bin
+++ b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_backup1.bin
Binary files differ
diff --git a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_backup2.bin b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_backup2.bin
index 9768f0d..5e4df8f 100644
--- a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_backup2.bin
+++ b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_backup2.bin
Binary files differ
diff --git a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_backup3.bin b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_backup3.bin
index 308f3d7..fe98cdc 100644
--- a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_backup3.bin
+++ b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_backup3.bin
Binary files differ
diff --git a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_backup4.bin b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_backup4.bin
index 047e1b0..93d0b16 100644
--- a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_backup4.bin
+++ b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_backup4.bin
Binary files differ
diff --git a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_backup5.bin b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_backup5.bin
index 51e1a4c..8e601c7 100644
--- a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_backup5.bin
+++ b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_backup5.bin
Binary files differ
diff --git a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_both0.bin b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_both0.bin
index ecb66bf..9c20853 100644
--- a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_both0.bin
+++ b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_both0.bin
Binary files differ
diff --git a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_both1.bin b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_both1.bin
index c16f0bd..dd0730b 100644
--- a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_both1.bin
+++ b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_both1.bin
Binary files differ
diff --git a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_both2.bin b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_both2.bin
index bd359d5..691646b 100644
--- a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_both2.bin
+++ b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_both2.bin
Binary files differ
diff --git a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_both3.bin b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_both3.bin
index ae4516f..4d534b4 100644
--- a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_both3.bin
+++ b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_both3.bin
Binary files differ
diff --git a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_both4.bin b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_both4.bin
index bc2cf44..e96ae6b 100644
--- a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_both4.bin
+++ b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_both4.bin
Binary files differ
diff --git a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_both5.bin b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_both5.bin
index 47be07d..adf440c 100644
--- a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_both5.bin
+++ b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_both5.bin
Binary files differ
diff --git a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_main0.bin b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_main0.bin
index 9fffcb8..79e1cae 100644
--- a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_main0.bin
+++ b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_main0.bin
Binary files differ
diff --git a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_main1.bin b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_main1.bin
index 33c7c99..b7bbaba 100644
--- a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_main1.bin
+++ b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_main1.bin
Binary files differ
diff --git a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_main2.bin b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_main2.bin
index ea6d98f..cc3f0eb 100644
--- a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_main2.bin
+++ b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_main2.bin
Binary files differ
diff --git a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_main3.bin b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_main3.bin
index ed6134e..12d0a41 100644
--- a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_main3.bin
+++ b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_main3.bin
Binary files differ
diff --git a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_main4.bin b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_main4.bin
index e690bd8..534e26e 100644
--- a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_main4.bin
+++ b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_main4.bin
Binary files differ
diff --git a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_main5.bin b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_main5.bin
index f7c071c..7c12784 100644
--- a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_main5.bin
+++ b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_main5.bin
Binary files differ
diff --git a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/patch0.xml b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/patch0.xml
index 3548ee3..28f4a18 100644
--- a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/patch0.xml
+++ b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/patch0.xml
@@ -3,10 +3,10 @@
   <!--NOTE: This is an ** Autogenerated file **-->
   <!--NOTE: Patching is in little endian format, i.e. 0xAABBCCDD will look like DD CC BB AA in the file or on disk-->
   <!--NOTE: This file is used by Trace32 - So make sure to add decimals, i.e. 0x10-10=0, *but* 0x10-10.=6.-->
-  <patch SECTOR_SIZE_IN_BYTES="4096" byte_offset="936" filename="gpt_main0.bin" physical_partition_number="0" size_in_bytes="8" start_sector="2" value="NUM_DISK_SECTORS-6." what="Update last partition 8 'userdata' with actual size in Primary Header."/>
-  <patch SECTOR_SIZE_IN_BYTES="4096" byte_offset="936" filename="DISK" physical_partition_number="0" size_in_bytes="8" start_sector="2" value="NUM_DISK_SECTORS-6." what="Update last partition 8 'userdata' with actual size in Primary Header."/>
-  <patch SECTOR_SIZE_IN_BYTES="4096" byte_offset="936" filename="gpt_backup0.bin" physical_partition_number="0" size_in_bytes="8" start_sector="0" value="NUM_DISK_SECTORS-6." what="Update last partition 8 'userdata' with actual size in Backup Header."/>
-  <patch SECTOR_SIZE_IN_BYTES="4096" byte_offset="936" filename="DISK" physical_partition_number="0" size_in_bytes="8" start_sector="NUM_DISK_SECTORS-5." value="NUM_DISK_SECTORS-6." what="Update last partition 8 'userdata' with actual size in Backup Header."/>
+  <patch SECTOR_SIZE_IN_BYTES="4096" byte_offset="1192" filename="gpt_main0.bin" physical_partition_number="0" size_in_bytes="8" start_sector="2" value="NUM_DISK_SECTORS-6." what="Update last partition 10 'userdata' with actual size in Primary Header."/>
+  <patch SECTOR_SIZE_IN_BYTES="4096" byte_offset="1192" filename="DISK" physical_partition_number="0" size_in_bytes="8" start_sector="2" value="NUM_DISK_SECTORS-6." what="Update last partition 10 'userdata' with actual size in Primary Header."/>
+  <patch SECTOR_SIZE_IN_BYTES="4096" byte_offset="1192" filename="gpt_backup0.bin" physical_partition_number="0" size_in_bytes="8" start_sector="0" value="NUM_DISK_SECTORS-6." what="Update last partition 10 'userdata' with actual size in Backup Header."/>
+  <patch SECTOR_SIZE_IN_BYTES="4096" byte_offset="1192" filename="DISK" physical_partition_number="0" size_in_bytes="8" start_sector="NUM_DISK_SECTORS-5." value="NUM_DISK_SECTORS-6." what="Update last partition 10 'userdata' with actual size in Backup Header."/>
   <patch SECTOR_SIZE_IN_BYTES="4096" byte_offset="48" filename="gpt_main0.bin" physical_partition_number="0" size_in_bytes="8" start_sector="1" value="NUM_DISK_SECTORS-6." what="Update Primary Header with LastUseableLBA."/>
   <patch SECTOR_SIZE_IN_BYTES="4096" byte_offset="48" filename="DISK" physical_partition_number="0" size_in_bytes="8" start_sector="1" value="NUM_DISK_SECTORS-6." what="Update Primary Header with LastUseableLBA."/>
   <patch SECTOR_SIZE_IN_BYTES="4096" byte_offset="48" filename="gpt_backup0.bin" physical_partition_number="0" size_in_bytes="8" start_sector="4" value="NUM_DISK_SECTORS-6." what="Update Backup Header with LastUseableLBA."/>
diff --git a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/rawprogram0.xml b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/rawprogram0.xml
index f9ec76b..f0a03e8 100644
--- a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/rawprogram0.xml
+++ b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/rawprogram0.xml
@@ -3,8 +3,10 @@
   <!--NOTE: This is an ** Autogenerated file **-->
   <!--NOTE: Sector size is 4096bytes-->
   <program SECTOR_SIZE_IN_BYTES="4096" file_sector_offset="0" filename="" label="persist" num_partition_sectors="8192" partofsingleimage="false" physical_partition_number="0" readbackverify="false" size_in_KB="32768.0" sparse="false" start_byte_hex="0x6000" start_sector="6"/>
-  <program SECTOR_SIZE_IN_BYTES="4096" file_sector_offset="0" filename="" label="system_a" num_partition_sectors="1518216" partofsingleimage="false" physical_partition_number="0" readbackverify="false" size_in_KB="6072864.0" sparse="false" start_byte_hex="0x2006000" start_sector="8198"/>
-  <program SECTOR_SIZE_IN_BYTES="4096" file_sector_offset="0" filename="" label="system_b" num_partition_sectors="1518216" partofsingleimage="false" physical_partition_number="0" readbackverify="false" size_in_KB="6072864.0" sparse="false" start_byte_hex="0x174a8e000" start_sector="1526414"/>
+  <program SECTOR_SIZE_IN_BYTES="4096" file_sector_offset="0" filename="" label="system_a" num_partition_sectors="1501832" partofsingleimage="false" physical_partition_number="0" readbackverify="false" size_in_KB="6007328.0" sparse="false" start_byte_hex="0x2006000" start_sector="8198"/>
+  <program SECTOR_SIZE_IN_BYTES="4096" file_sector_offset="0" filename="" label="system_b" num_partition_sectors="1501832" partofsingleimage="false" physical_partition_number="0" readbackverify="false" size_in_KB="6007328.0" sparse="false" start_byte_hex="0x170a8e000" start_sector="1510030"/>
+  <program SECTOR_SIZE_IN_BYTES="4096" file_sector_offset="0" filename="" label="vendor_boot_a" num_partition_sectors="16384" partofsingleimage="false" physical_partition_number="0" readbackverify="false" size_in_KB="65536.0" sparse="false" start_byte_hex="0x2df516000" start_sector="3011862"/>
+  <program SECTOR_SIZE_IN_BYTES="4096" file_sector_offset="0" filename="" label="vendor_boot_b" num_partition_sectors="16384" partofsingleimage="false" physical_partition_number="0" readbackverify="false" size_in_KB="65536.0" sparse="false" start_byte_hex="0x2e3516000" start_sector="3028246"/>
   <program SECTOR_SIZE_IN_BYTES="4096" file_sector_offset="0" filename="" label="super" num_partition_sectors="3036432" partofsingleimage="false" physical_partition_number="0" readbackverify="false" size_in_KB="12145728.0" sparse="false" start_byte_hex="0x2e7516000" start_sector="3044630"/>
   <program SECTOR_SIZE_IN_BYTES="4096" file_sector_offset="0" filename="" label="systemrw" num_partition_sectors="4096" partofsingleimage="false" physical_partition_number="0" readbackverify="false" size_in_KB="16384.0" sparse="false" start_byte_hex="0x5cca26000" start_sector="6081062"/>
   <program SECTOR_SIZE_IN_BYTES="4096" file_sector_offset="0" filename="" label="cache" num_partition_sectors="16384" partofsingleimage="false" physical_partition_number="0" readbackverify="false" size_in_KB="65536.0" sparse="false" start_byte_hex="0x5cda26000" start_sector="6085158"/>